[release/10.0] Fix InvalidCastException in OriginalValues.ToObject() with nested nullable complex properties#37703
Open
Copilot wants to merge 1 commit intorelease/10.0from
Open
Conversation
Copilot
AI
changed the title
[WIP] Fix InvalidCastException with complex properties in 10.0.2
Fix InvalidCastException in OriginalValues.ToObject() with nested nullable complex properties
Feb 13, 2026
Member
|
@copilot Update progress by rewriting the PR summary using this template: |
Contributor
Author
... Updated PR description with the requested template format. The issue number placeholder (#XXXXX) should be replaced with the actual issue number when available. |
test/EFCore.Tests/ChangeTracking/Internal/PropertyValuesTest.cs
Outdated
Show resolved
Hide resolved
AndriySvyryd
approved these changes
Feb 14, 2026
test/EFCore.Tests/ChangeTracking/Internal/PropertyValuesTest.cs
Outdated
Show resolved
Hide resolved
test/EFCore.Tests/ChangeTracking/Internal/PropertyValuesTest.cs
Outdated
Show resolved
Hide resolved
test/EFCore.Tests/ChangeTracking/Internal/PropertyValuesTest.cs
Outdated
Show resolved
Hide resolved
AndriySvyryd
changed the title
…d nullable complex properties Fixes #37516 Co-authored-by: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com>
AndriySvyryd
force-pushed
the
copilot/fix-invalid-cast-exception
branch
from
9167798 to
60956cf
Compare
There was a problem hiding this comment.
Pull request overview
This PR fixes an InvalidCastException that occurs when calling OriginalValues.ToObject() or CurrentValues.ToObject() on entities with nested nullable complex properties where intermediate or leaf properties are null. This is a regression introduced in PR #37302 (v10.0.2).
Changes:
- Fixed
ArrayPropertyValues.ToObject()to correctly navigate nested complex property hierarchies when setting null values - Added
NavigateToDeclaringTypehelper to correctly read values from nested complex properties - Added comprehensive test coverage for various nested complex property scenarios
- Implemented quirk mode switch
Microsoft.EntityFrameworkCore.Issue37516for backward compatibility
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| src/EFCore/ChangeTracking/Internal/ArrayPropertyValues.cs | Adds SetNestedComplexPropertyValue to recursively navigate complex property chains when setting values, and NavigateToDeclaringType to navigate to declaring types when reading values. Includes quirk mode switch for backward compatibility. |
| test/EFCore.Tests/ChangeTracking/Internal/PropertyValuesTest.cs | Refactors existing tests to use StateManager directly instead of DbContext, and adds comprehensive test coverage for nested nullable complex properties in various configurations (single properties, collections, and nested combinations). |
Comments suppressed due to low confidence (1)
test/EFCore.Tests/ChangeTracking/Internal/PropertyValuesTest.cs:192
- The ClassData attribute should use
DataGenerator<bool?>instead ofDataGenerator<bool>to match the parameter typebool? useOriginalValuesand test all three cases (null, false, true) like the other test methods. Currently, this test only covers false and true, missing the Clone() code path (null case).
[ClassData(typeof(DataGenerator<bool>))]
roji
approved these changes
Feb 21, 2026
| return root; | ||
| } | ||
|
|
||
| if (declaringType is not IComplexType ct) |
Member
There was a problem hiding this comment.
nit: merge with the above condition
| } | ||
|
|
||
| var child = currentProperty.GetGetter().GetClrValue(instance); | ||
| if (child == null) |
Member
There was a problem hiding this comment.
Especially because this is an arbitrary object where the equality operator might be overridden.
Suggested change
| if (child == null) | |
| if (child is null) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #37516
Port of #37762
Description
When calling
context.Entry(...).OriginalValues.ToObject(), anInvalidCastExceptionis thrown when entities have nested nullable complex properties and any of those nested properties are null.Customer impact
This prevents customers from using
OriginalValues.ToObject()with nested nullable complex properties.Workaround: Customers can set the AppContext switch
Microsoft.EntityFrameworkCore.Issue37516totrueto revert to the old behavior, but this disables the nullable complex property feature added in 10.0.2.How found
Customer reported on 10.0.2.
Regression
Yes, this is a regression from 10.0.1, introduced in #37302
Testing
Tests added.
Risk
Low. Quirk mode added.
💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.